bitkeeper revision 1.1159.207.1 (41d3ed24aepggBU18HkAQtTK4p7Z9A)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 30 Dec 2004 11:57:24 +0000 (11:57 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 30 Dec 2004 11:57:24 +0000 (11:57 +0000)
commita8406294509338a29a78255080b886fa0c0e8b00
treece4ab5e63f7998e6cfeb89c8141aa0a8a0ac4a16
parent38b23dd2a02bbf6ae9a9574767d130831cc8e8bc
parent5b1748e026bd4eb012d12c72dec5202daebda85c
bitkeeper revision 1.1159.207.1 (41d3ed24aepggBU18HkAQtTK4p7Z9A)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
.rootkeys
xen/arch/x86/setup.c